From 2b4f10d4cb428c28e6a9503627768556c4a432d5 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 3 May 2005 17:44:12 +0000 Subject: [PATCH] bitkeeper revision 1.1389.5.4 (4277b86czqxlqC40s7HyXb3A25SZkQ) Fix domU SMP build. Signed-off-by: Keir Fraser --- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c | 2 +- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c index 94ab4fd89f..36f313364f 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/mpparse.c @@ -37,7 +37,7 @@ /* Have we found an MP table */ int smp_found_config; -unsigned int __initdata maxcpus = NR_CPUS; +extern unsigned int maxcpus; /* * Various Linux-internal data structures created from the diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c index 2d385c1c09..772815d4b2 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c @@ -67,6 +67,8 @@ static struct notifier_block xen_panic_block = { int disable_pse __initdata = 0; +unsigned int __initdata maxcpus = NR_CPUS; + /* * Machine setup.. */ @@ -785,8 +787,6 @@ static void __init parse_cmdline_early (char ** cmdline_p) * maxcpus=N at enumeration-time can be used to disable HT. */ else if (!memcmp(from, "maxcpus=", 8)) { - extern unsigned int maxcpus; - maxcpus = simple_strtoul(from + 8, NULL, 0); } #endif -- 2.30.2